From 6ca1b1e68570c903330d47f869d623db3d2eca21 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 18 Jul 2006 10:15:37 +0000 Subject: [PATCH] use MAX priv->width, alloc.width when allocating the bin_window, 2006-07-18 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX priv->width, alloc.width when allocating the bin_window, (gtk_tree_view_bin_expose): don't overrun bin_window when drawing the flat box. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtktreeview.c | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b6691afdf..84059dcfe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-18 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX + priv->width, alloc.width when allocating the bin_window, + (gtk_tree_view_bin_expose): don't overrun bin_window when drawing + the flat box. + 2006-07-17 Richard Hult * gtk/gtkdnd-quartz.c: (gtk_drag_begin_internal): Set an empty diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7b6691afdf..84059dcfe6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-07-18 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_realize): use MAX + priv->width, alloc.width when allocating the bin_window, + (gtk_tree_view_bin_expose): don't overrun bin_window when drawing + the flat box. + 2006-07-17 Richard Hult * gtk/gtkdnd-quartz.c: (gtk_drag_begin_internal): Set an empty diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 17fda0b489..ff278f487f 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1728,7 +1728,7 @@ gtk_tree_view_realize (GtkWidget *widget) /* Make the window for the tree */ attributes.x = 0; attributes.y = TREE_VIEW_HEADER_HEIGHT (tree_view); - attributes.width = tree_view->priv->width; + attributes.width = MAX (tree_view->priv->width, widget->allocation.width); attributes.height = widget->allocation.height; attributes.event_mask = GDK_EXPOSURE_MASK | GDK_SCROLL_MASK | @@ -4121,7 +4121,8 @@ gtk_tree_view_bin_expose (GtkWidget *widget, widget, "cell_even", 0, tree_view->priv->height, - bin_window_width, bin_window_height); + bin_window_width, + bin_window_height - tree_view->priv->height); } if (node == NULL) -- 2.30.2